From 9eb636fe12699e6572ccc6debd30e8b4677e9f76 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Feb 2005 14:42:26 +0000 Subject: [PATCH] Don't emit a warning if a parent node is filtered out. (#164726, Olivier 2005-02-24 Matthias Clasen * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): Don't emit a warning if a parent node is filtered out. (#164726, Olivier Sessink) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreemodelfilter.c | 7 +++++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b6170b285..93d868143b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-24 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't emit a warning if a parent node is filtered out. (#164726, + Olivier Sessink) + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Revert the last diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0b6170b285..93d868143b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-24 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't emit a warning if a parent node is filtered out. (#164726, + Olivier Sessink) + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Revert the last diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0b6170b285..93d868143b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-24 Matthias Clasen + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): + Don't emit a warning if a parent node is filtered out. (#164726, + Olivier Sessink) + 2005-02-23 Matthias Clasen * gtk/gtklabel.c (gtk_label_style_set): Revert the last diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 206de37a4e..e025f73144 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1132,15 +1132,18 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model, } } + gtk_tree_model_filter_increment_stamp (filter); + if (!path) path = gtk_real_tree_model_filter_convert_child_path_to_path (filter, c_path, TRUE, TRUE); - g_return_if_fail (path != NULL); + if (!path) + /* parent is probably being filtered out */ + goto done; - gtk_tree_model_filter_increment_stamp (filter); gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path); level = FILTER_LEVEL (iter.user_data); -- 2.30.2